Produced by Araxis Merge on 2021-05-13 09:08:38 +0000. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a modern standards-compliant browser. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.
| # | Location | File | Last Modified |
|---|---|---|---|
| 1 | /Applications/Ampps/www/Porto 3.2.2/Theme Files/Magento 2.x/Porto Theme/app/code/Mageplaza/Core | .travis.yml | 2018-03-18 12:25:58 +0000 |
| 2 | /Applications/Ampps/www/Porto v4.0.0/Theme Files/Magento 2.x/Porto Theme/app/code/Mageplaza/Core | .travis.yml | 2018-03-18 12:25:58 +0000 |
| Description | Between Files 1 and 2 | |
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 1 | 140 |
| Changed | 0 | 0 |
| Inserted | 0 | 0 |
| Removed | 0 | 0 |
| Whitespace | Consecutive whitespace is treated as a single space |
|---|---|
| Character case | Differences in character case are significant |
| Line endings | Differences in line endings (CR and LF characters) are ignored |
| CR/LF characters | Not shown in the comparison detail |
| Active line-pairing rules |
No regular expressions were active.
| 1 | language: php | 1 | language: php | |||
| 2 | php: | 2 | php: | |||
| 3 | - 7.0 | 3 | - 7.0 | |||
| 4 | - 7.1 | 4 | - 7.1 | |||
| 5 | sudo: required | 5 | sudo: required | |||
| 6 | dist: trusty | 6 | dist: trusty | |||
| 7 | env: | 7 | env: | |||
| 8 | global: | 8 | global: | |||
| 9 | - COMPOSER_BIN_DIR=~/bin | 9 | - COMPOSER_BIN_DIR=~/bin | |||
| 10 | - INTEGRATION_SETS=3 | 10 | - INTEGRATION_SETS=3 | |||
| 11 | - NODE_JS_VERSION=6 | 11 | - NODE_JS_VERSION=6 | |||
| 12 | - MAGENTO_HOST_NAME="magento2.travis" | 12 | - MAGENTO_HOST_NAME="magento2.travis" | |||
| 13 | - COMPOSER_MODULE=mageplaza/module-core | 13 | - COMPOSER_MODULE=mageplaza/module-core | |||
| 14 | matrix: | 14 | matrix: | |||
| 15 | - MAGENTO_VERSION=2.1.1 TEST_SUITE=integration INTEGRATION_INDEX=1 | 15 | - MAGENTO_VERSION=2.1.1 TEST_SUITE=integration INTEGRATION_INDEX=1 | |||
| 16 | - MAGENTO_VERSION=2.1.1 TEST_SUITE=integration INTEGRATION_INDEX=2 | 16 | - MAGENTO_VERSION=2.1.1 TEST_SUITE=integration INTEGRATION_INDEX=2 | |||
| 17 | - MAGENTO_VERSION=2.1.1 TEST_SUITE=integration INTEGRATION_INDEX=3 | 17 | - MAGENTO_VERSION=2.1.1 TEST_SUITE=integration INTEGRATION_INDEX=3 | |||
| 18 | - MAGENTO_VERSION=2.1.10 TEST_SUITE=integration INTEGRATION_INDEX=1 | 18 | - MAGENTO_VERSION=2.1.10 TEST_SUITE=integration INTEGRATION_INDEX=1 | |||
| 19 | - MAGENTO_VERSION=2.1.10 TEST_SUITE=integration INTEGRATION_INDEX=2 | 19 | - MAGENTO_VERSION=2.1.10 TEST_SUITE=integration INTEGRATION_INDEX=2 | |||
| 20 | - MAGENTO_VERSION=2.1.10 TEST_SUITE=integration INTEGRATION_INDEX=3 | 20 | - MAGENTO_VERSION=2.1.10 TEST_SUITE=integration INTEGRATION_INDEX=3 | |||
| 21 | - MAGENTO_VERSION=2.2.1 TEST_SUITE=integration INTEGRATION_INDEX=1 | 21 | - MAGENTO_VERSION=2.2.1 TEST_SUITE=integration INTEGRATION_INDEX=1 | |||
| 22 | - MAGENTO_VERSION=2.2.1 TEST_SUITE=integration INTEGRATION_INDEX=2 | 22 | - MAGENTO_VERSION=2.2.1 TEST_SUITE=integration INTEGRATION_INDEX=2 | |||
| 23 | - MAGENTO_VERSION=2.2.1 TEST_SUITE=integration INTEGRATION_INDEX=3 | 23 | - MAGENTO_VERSION=2.2.1 TEST_SUITE=integration INTEGRATION_INDEX=3 | |||
| 24 | - MAGENTO_VERSION=2.2.2 TEST_SUITE=static | 24 | - MAGENTO_VERSION=2.2.2 TEST_SUITE=static | |||
| 25 | - MAGENTO_VERSION=2.2.2 TEST_SUITE=js GRUNT_COMMAND=static | 25 | - MAGENTO_VERSION=2.2.2 TEST_SUITE=js GRUNT_COMMAND=static | |||
| 26 | - MAGENTO_VERSION=2.2.2 TEST_SUITE=integration INTEGRATION_INDEX=1 | 26 | - MAGENTO_VERSION=2.2.2 TEST_SUITE=integration INTEGRATION_INDEX=1 | |||
| 27 | - MAGENTO_VERSION=2.2.2 TEST_SUITE=integration INTEGRATION_INDEX=2 | 27 | - MAGENTO_VERSION=2.2.2 TEST_SUITE=integration INTEGRATION_INDEX=2 | |||
| 28 | - MAGENTO_VERSION=2.2.2 TEST_SUITE=integration INTEGRATION_INDEX=3 | 28 | - MAGENTO_VERSION=2.2.2 TEST_SUITE=integration INTEGRATION_INDEX=3 | |||
| 29 | matrix: | 29 | matrix: | |||
| 30 | exclude: | 30 | exclude: | |||
| 31 | - php: 7.0 | 31 | - php: 7.0 | |||
| 32 | env: MAGENTO_VERSION=2.2.2 TEST_SUITE=js GRUNT_COMMAND=static | 32 | env: MAGENTO_VERSION=2.2.2 TEST_SUITE=js GRUNT_COMMAND=static | |||
| 33 | - php: 7.0 | 33 | - php: 7.0 | |||
| 34 | env: MAGENTO_VERSION=2.2.2 TEST_SUITE=static | 34 | env: MAGENTO_VERSION=2.2.2 TEST_SUITE=static | |||
| 35 | cache: | 35 | cache: | |||
| 36 | apt: true | 36 | apt: true | |||
| 37 | directories: | 37 | directories: | |||
| 38 | - "$HOME/.composer/cache" | 38 | - "$HOME/.composer/cache" | |||
| 39 | - "$HOME/.nvm" | 39 | - "$HOME/.nvm" | |||
| 40 | addons: | 40 | addons: | |||
| 41 | apt: | 41 | apt: | |||
| 42 | packages: | 42 | packages: | |||
| 43 | - mysql-server-5.6 | 43 | - mysql-server-5.6 | |||
| 44 | - mysql-client-core-5.6 | 44 | - mysql-client-core-5.6 | |||
| 45 | - mysql-client-5.6 | 45 | - mysql-client-5.6 | |||
| 46 | - postfix | 46 | - postfix | |||
| 47 | firefox: '46.0' | 47 | firefox: '46.0' | |||
| 48 | hosts: | 48 | hosts: | |||
| 49 | - magento2.travis | 49 | - magento2.travis | |||
| 50 | before_install: | 50 | before_install: | |||
| 51 | - git clone https://github.com/magento/magento2 --branch $MAGENTO_VERSION | 51 | - git clone https://github.com/magento/magento2 --branch $MAGENTO_VERSION | |||
| 52 | - cd magento2 | 52 | - cd magento2 | |||
| 53 | - bash ./dev/travis/before_install.sh | 53 | - bash ./dev/travis/before_install.sh | |||
| 54 | install: | 54 | install: | |||
| 55 | - composer install --no-interaction --prefer-dist | 55 | - composer install --no-interaction --prefer-dist | |||
| 56 | - composer config repositories.test_target git https://github.com/${TRAVIS_REPO_SLUG}.git | 56 | - composer config repositories.test_target git https://github.com/${TRAVIS_REPO_SLUG}.git | |||
| 57 | - composer require $COMPOSER_MODULE dev-$TRAVIS_BRANCH | 57 | - composer require $COMPOSER_MODULE dev-$TRAVIS_BRANCH | |||
| 58 | before_script: | 58 | before_script: | |||
| 59 | #- cp -f ${TRAVIS_BUILD_DIR}/dev/tests/integration/phpunit.xml.dist dev/tests/integration/ | 59 | #- cp -f ${TRAVIS_BUILD_DIR}/dev/tests/integration/phpunit.xml.dist dev/tests/integration/ | |||
| 60 | - echo "vendor/$COMPOSER_MODULE" > dev/tests/static/testsuite/Magento/Test/Less/_files/whitelist/common.txt | 60 | - echo "vendor/$COMPOSER_MODULE" > dev/tests/static/testsuite/Magento/Test/Less/_files/whitelist/common.txt | |||
| 61 | - echo "vendor/$COMPOSER_MODULE" > dev/tests/static/testsuite/Magento/Test/Php/_files/whitelist/common.txt | 61 | - echo "vendor/$COMPOSER_MODULE" > dev/tests/static/testsuite/Magento/Test/Php/_files/whitelist/common.txt | |||
| 62 | - echo "vendor/$COMPOSER_MODULE/**/*.js" > dev/tests/static/testsuite/Magento/Test/Js/_files/whitelist/magento.txt | 62 | - echo "vendor/$COMPOSER_MODULE/**/*.js" > dev/tests/static/testsuite/Magento/Test/Js/_files/whitelist/magento.txt | |||
| 63 | - cp -f ${TRAVIS_BUILD_DIR}/dev/tests/static/js/blacklist/3rd-party.txt dev/tests/static/testsuite/Magento/Test/Js/_files/blacklist/ | 63 | - cp -f ${TRAVIS_BUILD_DIR}/dev/tests/static/js/blacklist/3rd-party.txt dev/tests/static/testsuite/Magento/Test/Js/_files/blacklist/ | |||
| 64 | - bash ./dev/travis/before_script.sh | 64 | - bash ./dev/travis/before_script.sh | |||
| 65 | script: | 65 | script: | |||
| 66 | - test $TEST_SUITE = "static" && TEST_FILTER='--filter "Magento\\Test\\Php\\LiveCodeTest"' || true | 66 | - test $TEST_SUITE = "static" && TEST_FILTER='--filter "Magento\\Test\\Php\\LiveCodeTest"' || true | |||
| 67 | - test $TEST_SUITE = "functional" && TEST_FILTER='dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests.php' || true | 67 | - test $TEST_SUITE = "functional" && TEST_FILTER='dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests.php' || true | |||
| 68 | - if [ $TEST_SUITE == "functional" ]; then dev/tests/functional/vendor/phpunit/phpunit/phpunit -c dev/tests/$TEST_SUITE $TEST_FILTER; fi | 68 | - if [ $TEST_SUITE == "functional" ]; then dev/tests/functional/vendor/phpunit/phpunit/phpunit -c dev/tests/$TEST_SUITE $TEST_FILTER; fi | |||
| 69 | - if [ $TEST_SUITE != "functional" ] && [ $TEST_SUITE != "js" ]; then phpunit -c dev/tests/$TEST_SUITE $TEST_FILTER; fi | 69 | - if [ $TEST_SUITE != "functional" ] && [ $TEST_SUITE != "js" ]; then phpunit -c dev/tests/$TEST_SUITE $TEST_FILTER; fi | |||
| 70 | - if [ $TEST_SUITE == "js" ]; then grunt $GRUNT_COMMAND; fi | 70 | - if [ $TEST_SUITE == "js" ]; then grunt $GRUNT_COMMAND; fi |
Araxis Merge (but not the data content of this report) is Copyright © 1993–2019 Araxis Ltd (www.araxis.com). All rights reserved.